merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 15 Feb 2012 00:36:50 +0000 (09:36 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 15 Feb 2012 00:36:50 +0000 (09:36 +0900)
commitf1830f26ddb87b4658c5fab1b154914461e1037f
tree3f0425bc550a17d05d3ac8c0e30c21be44bd23d9
parent3c18e817d681386454221e84f0a5e0881a770677
parentc8e712bda971eddf60ca72a4cb06d114816f8cdb
merge trunk